merge
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 6 Mar 2006 17:21:35 +0000 (10:21 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 6 Mar 2006 17:21:35 +0000 (10:21 -0700)
1  2 
xen/arch/ia64/xen/xensetup.c

Simple merge